From: Carlos Garnacho Date: Tue, 27 Nov 2018 13:42:43 +0000 (+0100) Subject: dnd: Use StSettings instead of GtkSettings X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~897^2^2~75 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=81c4c23016d2fa309d4e5efac5b3f8cd551cae50;p=gnome-shell.git dnd: Use StSettings instead of GtkSettings Cut a middle man by listening to dconf settings directly, and stop relying on XSettings for it. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/317 --- diff --git a/js/ui/dnd.js b/js/ui/dnd.js index 07c19202a..c5a1c0517 100644 --- a/js/ui/dnd.js +++ b/js/ui/dnd.js @@ -2,7 +2,6 @@ const Clutter = imports.gi.Clutter; const GLib = imports.gi.GLib; -const Gtk = imports.gi.Gtk; const St = imports.gi.St; const Meta = imports.gi.Meta; const Shell = imports.gi.Shell; @@ -442,7 +441,7 @@ var _Draggable = class _Draggable { let [stageX, stageY] = event.get_coords(); // See if the user has moved the mouse enough to trigger a drag - let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold; + let threshold = St.Settings.get().drag_threshold; if (!currentDraggable && (Math.abs(stageX - this._dragStartX) > threshold || Math.abs(stageY - this._dragStartY) > threshold)) {